Merge git user management with main user tasks