Corrected remaining merge conflicts.