fixed layout basic
fix merge conflict