ignore runtime
modify the .gitignore
resolve confilict