Add environmental files into .gitignore
change of .gitignore
resolve conflict