two page conflicts

mbadillo05