white bar is gone
fixed merge conflict