pass all testcases of phase2
resolve conflicts