Fixed the merged error