just getting started
resolves merge conf