Some settings changes
Merged Conflicts