Revert "merge problem fixed"

This reverts commit 5aa143c368e9296e428f61327775c7182a0a8fa2.