Pick up file missed by merge