To stop the merge complaining?

GIT