Fixed a conflict introduced by my lack of understanding of how git works...