Not entirely sure what changes I made, but this is up to date now.
conflict resolution should go on my CV