Revert "adding merge"

This reverts commit 0b43b4950aa41b9c3bf3814e7d5e0dc6bbbabf5e.