Stuff added to CSS
resolve merge conflicts
by the book