conflict folder