Finally getting initial conflicts resolved.