Fixed the Merge