Fix merging problems
Fix depedencies problems
Updated .gitignore