Updating dependencies
Merging conflicts