Revert "Revert "fixed merge conflicts""

This reverts commit 43e126f22ca99ae9452fb2cee07c17de46a88105.
merr