.gitignore from server
merge commit