first
resolving conflicts