Fixed problem with merging branches