fixing association conflicts