get merge working