Added the *.css ignore command
Resolved the merge conflict, added the *.css