Revert "Fixed merge garbage error"

This reverts commit 34538c22ec02e57bd2f111a634e28afba74c5363.