Bootstrap, 12_factor
Merge resolve