.
move into prolog folder, update text
fix merge conflict