Silly git, accidentally added some residual merge/conflict files