Revert "fixed merging error"

This reverts commit 9652906c7938cdbde2db7197ca7f834233b092a7.