Merge error been fixed