setup for multi-file conflict