Fix merge conflicted file