Errors after Merge