Quick commit before pulling remote changes
Merging conflicts