Removed conf file (using default). Fixed conflict leftovers (>>>). Make-distribution scripts copies all conf/ contents