resolve merge conflicts
solve merge conflicts part2