resolve the other branch modify file in this branch