Third change at GitHub, should create conflict again

This is the Third change at GitHub, should create conflict again