committing before conflicts
Merging