fix all errors on merge