disable notes css for fast iteration
pull and conflicts