Removed merge line