line based merge works
merge with ui