Conflicts Resolved. I hope.