merge error fixed