2nd merged commit