Fixed all merge conflicts.