merge gitignore from dev