Support merging configration with mergemaster.

Update README accordingly.