print statement added
handling conflict
handling conflicts