fixing layout
fix merge conflict