update gitignore
figure enviroment; gost bibliography
conflict resolve