Modifications to improve pass rates
Resolving conflicts