Tagged: resolve a conflict