working on Conflict Page and adding css for it
working on Conflict Page and adding css for it