REading specific file from haystack works
Fixed merge conficts