moar fixes
fix merge conflict