solve the confict