fix gitignore
merge image