pull-merged staging into design on local machine fixing all conflicts.