Revert "sort out merge issue 1"

This reverts commit ed5c9d16bad99e7f1e0a6cbd0c5132bba6c9b684.