cleared conflicts in staging.js