resolve conflicts.  add installation save to parse