Revert "Fixed a Merge Problem"

This reverts commit 8d3ee7e1056c3c94ca131f39d34b5e666fce52d0.