use custom configuration file to prevent merge conflicts