Revert "Revert "Fixed merge garbage error""

This reverts commit 01f7d0686c594a0687b6331b9c3742a952829c99.