trying to remove side scroll bar
removing scroll bar
Fixed conflicts