Fixed some merge bugs.Flattened the config file (no public or private, no need here)