updated gitignore
fixed merge problems