finalize pre-merge
fix merge