Git Resolve Conflict Using Mine