minor conflict fixed