I don't know for sure, but I think Chuck and Amara made peace and that's how the conflict ended. They were on good terms until recently.

[ When Jack went to kill both of them and Chuck absorbed Amara into himself once she realized they were going to betray her. Jack feels really bad about that. She seemed willing to help them and it was underhanded to kill her for it, but he understood this was about a big picture situation. They had to stop Chuck, and she was collateral damage. Sometimes being the good guy didn't allow them to be one hundred percent good all the time.

Jack curiously looks at the car, it's an Impala but nothing like Baby, obviously. ]

You let Lucifer in to try and defeat the bad guy and save everyone. The fact you can't actually control Lucifer is not your fault. I tried to too, and he didn't care about me either.