Fix layout dimen
fix conflict