Merging conflicts fixed.