Removes merge conflict 

Next time, don't force push