config files and log junk
fix merge conflict