Cleaned up with new patches applied.
Conflict resolution