refactor css / add to git ignore
resolve merge conflict