restore origin .gitignore contents again
prevent use of realpath
merge .gitignore with develop