Remove bad merge artifacts