Stupid merge conflicts are stupid