resolved the conflict for real this time