css merge fix
Merge pull request #133 from dontmitch/css-remove-merge-conflicts

css merge fix