Solving confusing github conflict between user commits