Fixed merge/branch issue