configfile
stuff
resolve merge