add files
resolve gitignore conflict