got merge working