Conflict gone