Remove bad merge stuff