Added gitignore
Solve merge