Gray line
Fixed merge conflicts