ticket:4 fixed merge issues in settings