Update Cameras and fixed Conflicts

As the titles states, Cameras fixed in levels 03,04, and 05 as well as resolved conflicts from updates.