Merge error corrected