Really fixed the merge conflicts this time.