fix creation merge corner case