conflict resolved on css file