conflict resolution
fixed nil error from zero conjugates trying to get split