short information
add gitignore file
conflict