Changed default for staging
Finished conflict