fixing merging problem part 2