Removed bad merge line