Restore omniauth module
Solve merging bugs
Remove this lock file