removed conflicted file