fix pull conflict
Fix merge conflicts master..alex
Removing node_modules from git history