removed merge line