You need to fix conflicts with current version of staging on remote (on github.com). Be VERY CAREFUL as you merge and resolve conflicts; be sure to review and include the changes locally and remote - do not simply ignore improvements locally or remotely.
You need to fix conflicts with current version of staging on remote (on github.com). Be VERY CAREFUL as you merge and resolve conflicts; be sure to review and include the changes locally and remote - do not simply ignore improvements locally or remotely.