Finishing the merge errors