Revert "Fixed Conflicts"

This reverts commit 8931c61db776c4806d5a22895198e2bbab00c563.