got right merge working