create 4 resolve conflicts