merge branch working