Fixed merge conflict, saving updates
Fixing merge conflict again