Revert "Revert "fix merge issues""

This reverts commit 73a0678fadb420675ea982eaa7f6dfaec08fedec.