Lexie created a conflict version.

Lexie asked for merging conflicted line.