Changed the broken code for staging
merge conflict resolved