active row
fix merge conflicts