<@U0F3291QE> - the conflict was the changelog entr...
# tornadofx
g
@edvin - the conflict was the changelog entry which I manually resolved