Fixed the merges