Git Both Modified Keep Mine