CONFLICT

An append met another commit at its version.