fixed merge problem and .gitignore