initial
resolve conflicts