Git Both Modified Resolve