conflict fixed 2