fixed css file merge conflict