project settings
fixed merge issues