Fixed all merge conflicts. Up-to-date.