Fix the merge conflix.