adding in errors from overwrite in merge