All is great
resolved conflicts