Crisis Averted - For the moment in Hello

So somehow we have managed to sort out the major issue we had that led to the prior entry. It's not sorted completely but at least we have reached a truce. I don't know how I feel to be honest on the day that we came to an agreement about the reason for the conflict the solution seemed reasonable but now I'm not sure that I'm so happy with the outcome so I know this issue will spring up again.