Fix for PTR_0003
Fix for PTR_0004 to use git mergetool
After fix PTR_0003 and PTR_0004, merge and solve conflict with mergetool