solve merging conflicts 2