would be nice to cover revert and conflicts if we have time
would be nice to cover revert and conflicts if we have time