Merging conflicts resolved