sidebar bottom
merge conflict fix