GIT - 5.6 conflict resolution