Saving local changes
Fixing merge conflict