merging for rightbar fix