merge conflict resolved
settings finished
settings menu scrollbar