merge .gitignore for astah bak file