change change change
conflicts merged
added more resources, added private local directory for sensitive material