removing the merge errors

^^