Updating WIP section
resolving conflicts and committing WIP changes