Added more integration tests on concurrent commits simulating real life complex commit scenarios

[grecinto]

SOP passed with flying colors "rolling back" bad conflicts and "auto retry merging" good conflicts.