add level 7
resolve conflicts