Further conflict resolution, some warnings removed.