merging
merging
deleted gitignore
check conflicts