I'm sure these mean well
Fix merge conflicts