Best config mockup
Merge with remote