simple conflict + unstaged
sub level conflicts