patch unlucky merge