commiting merge line from other branch