Testing new branching method
Fixed fake staging bugs in develop branch