Fixed some damn merge conflicts.