Add settings and fix merge conflict