Revert "Revert "local master branch""

This reverts commit 72fa781c9cbfa71f962f07d6f2fc67c7ece61397.
Fixing Reverts