styles
resolving conflicts