Fixed merge and branch issue