stable: implement and debug goal state section
stable: fix conflict