comment bar notches working properly
resolve merge conflict