wrong resolution of conflict which led to error solved