adm
meluruskan
after conflict