git commit --amend -m "xxxx merge into xx resolve conflict"