Testing merge with no editor option