nuwa/stage: links for gitconflict