[ BUGFIX ] resolve rebase issues
[ BUGFIX ] resolve rebase issues

hellodanali/Regexcellence,Regexcellence/Regexcellence,lwonsower/Regexcellence,hellodanali/Regexcellence,bbtran/Regexcellence,Regexcellence/Regexcellence,lwonsower/Regexcellence,bbtran/Regexcellence