Fixed top bar
fixed merge