merge working