Fix defaults typo
resolve merge conflict