changed some settings
merged conflicts