Merge login build with dev