Stashing local changes
Fixing merge conflicts