got rid of some conflcits