4xm: resolve conflicts