fix prim typo
resolve conflicts