score singleton
resolved conflicts