change ordering
fix merge conflicts