Merge changes before adding error control