Revert "Solved Merging Conflicts"

This reverts commit 27b16317b55693255ba712abb270a97e9ca4687f.