layout style
resolved conflicts