Review of conflict resolution methods for manned and unmanned aviation