Fix a small issue with commit collisions