without gitignore
for merging