Correcting bad merge