Fixed merge conflicts.