Fixed pull/merge conflicts.