calculator merge error fixed