Add: Merged with local changes, login and dashboard