carton setting
resolve conflicts