Fix broken conflicted file chechin