Fixed the merged