fix those badly merged files