Incremental commit
Merged conflicts