left bar front end
merge conflict resolved