Test run of git and simplified collisions