step3 layout change
conflicts resolved