ListProjstc
resolve conflicts