fix braindead merge mistakes that git, frankly, makes all-too easy for n00bs