Revert "Merge (git merge not working)"

This reverts commit 2902a53dd9610aa4b5d0a1fa351e42211e432175.