treat conflicts as OK... take 2
treat conflicts as OK... take 3
bump