Remove a merge conflict generated on Github