Remove diff column, and inline with master