move css file
change file paths
merge conflicts