Experiment 1: file collision before git pull
Experiment 1.5: git pull/manual merge on main.cpp