You left out the third type. Just merge to master, don't wait for review!