Adding conflict script