Added .gitignore + Merge issues Fixed