Fix all the merge errors