errors are now cleared during successful merge