Checking GIT conflict Resolution