resolved conflict in post