Resolved merging conflicts