Trying to force a conflict to figure out how to fix using the windows git gui