Revert "Revert "fix merge""

This reverts commit 7bf5d07fa79d4131549a6b98711799e14e94cb2b.