Shit ton of merge conflicts