ppt outline sublime text
fixing some merge issue