HOME DEV_2: Make conflict