still trying to sort through conflicts