modified settings for easy of merging