update merge to show errors that occurred