testing div class naming
manual merge of css conflict