style fixes
fix merge conflicts