Solve conflict in Marshall