- fix conflicts

 - process FAILED status
 - fix conflicts