conflict hopefully resolved