adds some design
resolves conflicts