Removing extra code I accidentally pasted in
Remote and local conflicts