Edit top bar
Resolve conflict at at top bar