Pranit: master conflicts pretest2