Use unique identifier for conflicting rebase integration test