merged
modified .gitignore
fixed merge now?