Merge error fixed