Modified .gitignore
Fixed merge coflicts