update gitignore and working tree to prevent future merge conflicts