solve conflicts
adjust clearfix