with conflicts resolved