Merge resolution
Revert stashed changes
Login user on creation
Remove redundant files