resolved merging conflicts