fixed paths and ignore files
merge conflicts