Conflicts button issues

[AlexTryjan]

decine and accept are ordered incorrectly and drop down is not actually a drop down.

[JLaRue96]

decline and accept have been re-ordered. Working on drop down at the moment.