fix moar merge conflicts