first real merge to staging

recommended files