layout changes, default select value
resolved conflicts