Pranit: develop conflicts pretest2