Fixed issue with merging branches