Fixed shared merge conflicts.