added option to skip checking conflicting files