moar merge fix