reseting sidebar position
reset and revert sidebar position
fixing merge conflict