Resolving conflicts

Resolving the last few conflicts.