I am stil unable to approve, Is there some way for me to fix the conflicts?

It is still giving me an error message . . . I think it needs something merging . . .

I will take a look at some random tests for the ruby version

I cant seem to merge this as it says 'Description cannot be approved, recent changes from related record must be merged first.'