did some more testing and conflicts look OK