resolved heruko conflict