Revert "fixed some merging issues"

This reverts commit a34fc7edbdb26d77db5b7ad7fc79e6caa14add70.