Better exception handling.
Merge conflict.