simple conflict + unstaged