Actually resolved the conflict this time.