adjust flexlayout
fix merge