Exceptions changes
Resolving conflicts