fixing merge conflicts part 2