time to merge errors into master