initialization
resolved conflict for gitignore