Fixed the Merge errors