Description
Unable to merge because the branches conflict. MDOQ tried to merge the branches, but was unable to due to there being changes on each branch that conflict.
Troubleshooting
To resolve the commit in Github see here
If you are still unsure please raise a support request.