update layoutmain conflict