fix .gitignore file and delete merge notes from files