Revert "Setting up for a Merge between branches"

This reverts commit 3b8a4f497fd1589f8b97a4c136b013f739385556.