Fixed the merge errors