Deleted test monkey photos and fixed the merge error on main.scala