resolve conflict?

resolve conflict?
easy, I can merge it using p4merge tool