Manually merged files to prevent conflicts

Why can't you guys just merge this pull request when there're no
conflicts? /weep