resolve the conflic