Added webkit scrollbar styling
Fixed automerge fail