ticket:4 Fixed settings import
ticket:4 Fixed conflict