conflict fixed finally