using ptic, using depugger
conflicts merged