fix merge
adjusted gitignore