Revert "Fixed merg problems."

This reverts commit 81210e6952adc26ecb27a9dc9a12ed85c37274e9.