fix project settings
fixed merge