delete .gz file
resolving conflicts on generated files
add gitignore for generated files
modify abstract