removed merge conflicts part 2