Manually resolved merging conflicts