Initial git of unconfigured base system.
fix merge conflict