ok now, certain folders are ignored, hopefully will fix conflicts later