manually merge line for conflict