Removing the merge error